From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Fri, 21 Dec 2012 14:05:34 +0000 (-0500)
Subject: boxpointer: Clean up reposition
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5177
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b14b3ab27681d7fc9bff8d97153474c64f7487a3;p=gnome-shell.git

boxpointer: Clean up reposition

Given that it's modifying state, there's no reason it can't be
using it instead. This makes it easier to use, so we aren't passing
in a bunch of instance variables every time.

https://bugzilla.gnome.org/show_bug.cgi?id=690608
---

diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 01bc2c8d8..db8244900 100644
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -220,7 +220,7 @@ const BoxPointer = new Lang.Class({
         this.bin.allocate(childBox, flags);
 
         if (this._sourceActor && this._sourceActor.mapped) {
-            this._reposition(this._sourceActor, this._arrowAlignment);
+            this._reposition();
 
             if (this._shouldFlip()) {
                 switch (this._arrowSide) {
@@ -237,7 +237,7 @@ const BoxPointer = new Lang.Class({
                     this._arrowSide = St.Side.LEFT;
                     break;
                 }
-                this._reposition(this._sourceActor, this._arrowAlignment);
+                this._reposition();
             }
         }
     },
@@ -417,7 +417,7 @@ const BoxPointer = new Lang.Class({
         this._sourceActor = sourceActor;
         this._arrowAlignment = alignment;
 
-        this._reposition(sourceActor, alignment);
+        this._reposition();
     },
 
     setSourceAlignment: function(alignment) {
@@ -429,7 +429,10 @@ const BoxPointer = new Lang.Class({
         this.setPosition(this._sourceActor, this._arrowAlignment);
     },
 
-    _reposition: function(sourceActor, alignment) {
+    _reposition: function() {
+        let sourceActor = this._sourceActor;
+        let alignment = this._arrowAlignment;
+
         // Position correctly relative to the sourceActor
         let sourceNode = sourceActor.get_theme_node();
         let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());